--- gftp-2.0.19.orig/debian/copyright
+++ gftp-2.0.19/debian/copyright
@@ -1,13 +1,17 @@
 This package was originally debianized by Martin Schulze on 5 Jan 1999, and
 later maintained by Brian E. Ermovick, then Josip Rodinand and, then Aurelien
-Beaujean. Today, it's maintained by Aurelien Jarno <aurel32@debian.org>.
+Beaujean. Today, it's maintained by Xavier Oswald <xoswald@debian.org>.
 
 It was downloaded from http://www.gftp.org/
 
-Authors: Brian Masney <masneyb@gftp.org>
+Upstream Authors:
+  Copyright (C) 1998-2009 Brian Masney <masneyb@gftp.org>
 
-Copyright 1998-2006 Brian Masney
+Files: debian/*
+  Copyright (C) 2009 Xavier Oswald <xoswald@debian.org>
+  License: GPL 1+
 
+License:
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
@@ -22,6 +26,5 @@
    with this program; if not, write to the Free Software Foundation, Inc.
    51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA.
 
-
 On Debian systems, the complete text of the GNU General Public License can
 be found in the `/usr/share/common-licenses/GPL' file.
--- gftp-2.0.19.orig/debian/watch
+++ gftp-2.0.19/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://www.gftp.org/gftp-(.*)\.tar\.gz
--- gftp-2.0.19.orig/debian/control
+++ gftp-2.0.19/debian/control
@@ -1,18 +1,16 @@
 Source: gftp
 Section: net
 Priority: optional
-Maintainer: Aurélien GÉRÔME <ag@roxor.cx> 
-Build-Depends: debhelper (>> 4.0.0), autotools-dev, libreadline5-dev | libreadline-dev, libgtk2.0-dev (>= 2.0.9), libglib2.0-dev (>= 2.2.0), imagemagick
-Standards-Version: 3.7.3
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Xavier Oswald <xoswald@debian.org> 
+Build-Depends: debhelper (>= 7), autotools-dev, libreadline-dev, libgtk2.0-dev (>= 2.0.9), libglib2.0-dev (>= 2.2.0), imagemagick
+Standards-Version: 3.8.3
 Homepage: http://www.gftp.org/
-Vcs-Git: git://git.roxor.cx/git/gftp/
-Vcs-Browser: http://git.roxor.cx/?p=gftp
-XS-DM-Upload-Allowed: yes
 
 Package: gftp
 Architecture: all
-Depends: gftp-gtk (>= ${source:Version}), gftp-text (>= ${source:Version})
-Description: X/GTK+ FTP client
+Depends: gftp-gtk (>= ${source:Version}), gftp-text (>= ${source:Version}), ${misc:Depends}
+Description: X/GTK+ and console FTP client
  gFTP is a multithreaded FTP client, available in two versions:
   * version for X, written using GLib and GTK+
   * version for the console, using only GLib
@@ -21,11 +19,11 @@
 
 Package: gftp-gtk
 Architecture: any
-Depends: ${shlibs:Depends}, gftp-common (= ${binary:Version})
+Depends: ${shlibs:Depends}, gftp-common (= ${binary:Version}), ${misc:Depends}
 Conflicts: gftp-common (<< 2.0.14-1)
 Description: X/GTK+ FTP client
- gFTP is a multithreaded FTP client. This version of it runs under X
- and was written using GLib/GTK+.
+ gFTP graphical version is a multithreaded FTP client running under X and
+ written using GLib/GTK+.
  .
  gFTP features:
    * simultaneous downloads,
@@ -45,10 +43,10 @@
 
 Package: gftp-text
 Architecture: any
-Depends: ${shlibs:Depends}, gftp-common (= ${binary:Version})
+Depends: ${shlibs:Depends}, gftp-common (= ${binary:Version}), ${misc:Depends}
 Description: colored FTP client using GLib
- gFTP is a multithreaded FTP client. This version of it runs under console
- and was written using GLib.
+ gFTP text version is a multithreaded FTP client running under console and
+ written using GLib.
  .
  gFTP features:
    * simultaneous downloads,
@@ -68,6 +66,7 @@
 
 Package: gftp-common
 Architecture: any
+Depends: ${misc:Depends}
 Description: shared files for other gFTP packages
  gFTP is a multithreaded FTP client. This package contains the locale data
  used by both gftp-gtk and gftp-text, along with a common manual page.
--- gftp-2.0.19.orig/debian/rules
+++ gftp-2.0.19/debian/rules
@@ -1,8 +1,5 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
 
-# Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
 # These are used for cross-compiling and for saving the configure script
@@ -17,12 +14,10 @@
 
 config.status: configure
 	dh_testdir
-	
 	-test -r /usr/share/misc/config.sub && \
 	cp -f /usr/share/misc/config.sub config.sub
 	-test -r /usr/share/misc/config.guess && \
 	cp -f /usr/share/misc/config.guess config.guess
-
 	chmod +x ./configure
 	CFLAGS="-O2 -g -Wall -D_GNU_SOURCE" ./configure \
 		--host=$(DEB_HOST_GNU_TYPE) \
@@ -52,21 +47,21 @@
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs
-	
 	# Main install.
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-	
 	# Install icon
 	convert -geometry 32x32 $(CURDIR)/debian/tmp/usr/share/pixmaps/gftp.png $(CURDIR)/debian/tmp/usr/share/pixmaps/gftp.xpm
-
+	# Add translation domain to .desktop and .server files
+	for d in $$(find debian/tmp -type f -name "*.desktop" ); do \
+	    echo "Adding translation domain to $$d..."; \
+	    echo "X-Ubuntu-Gettext-Domain=gftp" >> $$d; \
+	done;
 	# Move all files in their corresponding package
 	dh_install --sourcedir=debian/tmp
-
 	# Install parse-netrc.pl
 	install -m 755 $(CURDIR)/docs/parse-netrc.pl $(CURDIR)/debian/gftp-common/usr/share/doc/gftp-common/examples
-
 	# Move bookmarks and gftprc to /etc/gftp
 	mv $(CURDIR)/debian/gftp-common/usr/share/gftp/gftprc $(CURDIR)/debian/gftp-common/etc/gftp
 	mv $(CURDIR)/debian/gftp-common/usr/share/gftp/bookmarks $(CURDIR)/debian/gftp-common/etc/gftp
--- gftp-2.0.19.orig/debian/changelog
+++ gftp-2.0.19/debian/changelog
@@ -1,8 +1,44 @@
-gftp (2.0.19-1) unstable; urgency=low
+gftp (2.0.19-2ubuntu1) lucid; urgency=low
 
-  * New release. See the ChangeLog file for details on changes in this release
+  * Sync on Debian
+  * debian/rules: 
+    - Add gettext domain to .server and .desktop files to get
+      language pack support for them. (Similarly to cdbs' gnome.mk)
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Fri, 27 Nov 2009 00:03:46 +0100
+
+gftp (2.0.19-2) unstable; urgency=low
+
+  * Bump Standards-Version to 3.8.3
+  * Set debian/compat to 7
+  * Update debian/copyright with debian/* files copyright
+  * Fix incorrect handling of filename encodings under UTF-8 enviromnent.
+    (Closes: #364592) Fixed upstream.
+  * Fix missing files and sub-directories (Closes: #344595)
+    This is not a bug but gnome choices to not go deeper than 2 directories
+  * Replace libreadline5-dev build dependency with libreadline-dev 
+    (Closes: #553764)
+  * Crash on some servers and certains conditions (Closes: #442938)
+  * gftp hides directories (Closes: #518157)
+  * Fix lintian:
+    W: gftp source: dh-clean-k-is-deprecated
+    W: gftp source: configure-generated-file-in-source config.log
+
+ -- Xavier Oswald <xoswald@debian.org>  Sun, 08 Nov 2009 11:32:49 +0100
+
+gftp (2.0.19-1) unstable; urgency=low
+  
+  * New upstream release
+  * Set met as maintainer. Thanks to Aurélien for his work.
+  * debian/control:
+    - Remove DM flag
+    - Remove old Vcs-*
+    + Update version of debhelper in Build-Depends
+  * Set debian/compat to 7
+  * Update debian/copyright
+  * Bump Standards-Version to 3.8.1
 
- -- Brian Masney <masneyb@gftp.org>  Sun, 30 Nov 2008 16:31:32 -0500
+ -- Xavier Oswald <xoswald@debian.org>  Tue, 21 Apr 2009 14:00:34 +0200
 
 gftp (2.0.18-17) unstable; urgency=medium
 
--- gftp-2.0.19.orig/debian/compat
+++ gftp-2.0.19/debian/compat
@@ -1 +1 @@
-4
+7
--- gftp-2.0.19.orig/.pc/.version
+++ gftp-2.0.19/.pc/.version
@@ -0,0 +1 @@
+2
--- gftp-2.0.19.orig/.pc/applied-patches
+++ gftp-2.0.19/.pc/applied-patches
@@ -0,0 +1 @@
+utf8
--- gftp-2.0.19.orig/.pc/utf8/lib/gftp.h
+++ gftp-2.0.19/.pc/utf8/lib/gftp.h
@@ -0,0 +1,1141 @@
+/*****************************************************************************/
+/*  gftp.h - include file for the whole ftp program                          */
+/*  Copyright (C) 1998-2003 Brian Masney <masneyb@gftp.org>                  */
+/*                                                                           */
+/*  This program is free software; you can redistribute it and/or modify     */
+/*  it under the terms of the GNU General Public License as published by     */
+/*  the Free Software Foundation; either version 2 of the License, or        */
+/*  (at your option) any later version.                                      */
+/*                                                                           */
+/*  This program is distributed in the hope that it will be useful,          */
+/*  but WITHOUT ANY WARRANTY; without even the implied warranty of           */
+/*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            */
+/*  GNU General Public License for more details.                             */
+/*                                                                           */
+/*  You should have received a copy of the GNU General Public License        */
+/*  along with this program; if not, write to the Free Software              */
+/*  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.                */
+/*****************************************************************************/
+
+/* $Id: gftp.h 960 2008-03-28 11:44:36Z masneyb $ */
+
+#ifndef __GFTP_H
+#define __GFTP_H
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+/* *BSD include 64bit off_t but _LARGEFILE_SOURCE is not defined. */
+#if defined (SIZEOF_OFF_T) && SIZEOF_OFF_T > 4 && !defined (_LARGEFILE_SOURCE)
+#define _LARGEFILE_SOURCE 1
+#endif
+
+#if defined (_LARGEFILE_SOURCE) && !defined (_LARGEFILE64_SOURCE)
+#define _LARGEFILE64_SOURCE 1
+#endif
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/socket.h>
+#include <sys/time.h>
+#ifndef TIOCGWINSZ
+#include <sys/ioctl.h>
+#endif
+#include <sys/wait.h>
+#include <sys/utsname.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <glib.h>
+#include <limits.h>
+#include <netdb.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <ctype.h>
+#include <time.h>
+#include <utime.h>
+#include <signal.h>
+#include <termios.h>
+#include <pwd.h>
+#include <setjmp.h>
+#include <dirent.h>
+#include <grp.h>
+#include <math.h>
+
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
+
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
+
+#ifdef HAVE_STRING_H
+#include <string.h>
+#else
+#include <strings.h>
+#endif
+
+#ifdef USE_SSL
+#include <openssl/bio.h>
+#include <openssl/err.h>
+#include <openssl/rand.h>
+#include <openssl/ssl.h>
+#include <openssl/x509v3.h>
+#endif
+
+#ifdef ENABLE_NLS
+#include <libintl.h>
+#include <locale.h>
+#define _(String) gettext (String)
+#else 
+#define _(String) String
+#endif
+#define N_(String) String
+
+#ifndef AF_LOCAL
+#define AF_LOCAL AF_UNIX
+#endif
+
+/* Solaris needs this included for major()/minor() */
+#ifdef HAVE_SYS_MKDEV_H
+#include <sys/mkdev.h>
+#endif
+
+/* We need the major() and minor() macros in the user interface. If they aren't
+   defined by the system, we'll just define them here. */
+#ifndef major
+#warning major macro was not defined by the system. Defining one that is probably wrong for your system
+#define major(dev) (((dev) >> 8) & 0xff)
+#endif
+
+#ifndef minor
+#warning minor macro was not defined by the system. Defining one that is probably wrong for your system
+#define minor(dev) ((dev) & 0xff)
+#endif
+
+#ifdef WITH_DMALLOC
+
+#undef g_malloc
+#define g_malloc(size) \
+  _malloc_leap(__FILE__, __LINE__, size)
+
+#undef g_malloc0
+#define g_malloc0(size) \
+  _calloc_leap(__FILE__, __LINE__, 1, size)
+
+#undef g_realloc
+#define g_realloc(ptr, size) \
+  _realloc_leap(__FILE__, __LINE__, ptr, size)
+
+#undef g_strdup
+#define g_strdup(str) \
+  _strdup_leap(__FILE__, __LINE__, str)
+
+#undef g_free
+#define g_free(ptr) \
+  _free_leap(__FILE__, __LINE__, ptr)
+
+#include <dmalloc.h>
+
+#endif
+
+#ifdef __GNUC__
+# define GFTP_LOG_FUNCTION_ATTRIBUTES __attribute__((format(printf, 3, 4)))
+#else
+# define GFTP_LOG_FUNCTION_ATTRIBUTES
+#endif
+
+#if defined (HAVE_GETADDRINFO) && defined (HAVE_GAI_STRERROR)
+# define HAVE_IPV6
+#endif
+
+#if defined (_LARGEFILE_SOURCE) && !defined (__hppa__) && !defined (__hppa)
+#define GFTP_OFF_T_HEX_PRINTF_MOD	"%llx"
+#define GFTP_OFF_T_INTL_PRINTF_MOD	"%'lld"
+#define GFTP_OFF_T_PRINTF_MOD		"%lld"
+#define GFTP_OFF_T_11PRINTF_MOD		"%11lld"
+#define gftp_parse_file_size(str)	strtoll (str, NULL, 10)
+#define GFTP_OFF_T_PRINTF_CONVERSION	long long
+#else
+#define GFTP_OFF_T_HEX_PRINTF_MOD	"%lx"
+#define GFTP_OFF_T_INTL_PRINTF_MOD	"%'ld"
+#define GFTP_OFF_T_PRINTF_MOD		"%ld"
+#define GFTP_OFF_T_11PRINTF_MOD		"%11ld"
+#define gftp_parse_file_size(str)	strtol (str, NULL, 10)
+#define GFTP_OFF_T_PRINTF_CONVERSION	off_t
+#endif
+
+/* Server types (used by FTP protocol from SYST command) */
+#define GFTP_DIRTYPE_UNIX	1
+#define GFTP_DIRTYPE_EPLF	2
+#define GFTP_DIRTYPE_CRAY	3	
+#define GFTP_DIRTYPE_NOVELL	4	
+#define GFTP_DIRTYPE_DOS	5	
+#define GFTP_DIRTYPE_VMS	6	
+#define GFTP_DIRTYPE_OTHER 	7
+#define GFTP_DIRTYPE_MVS	8
+
+/* Error types */
+#define GFTP_ERETRYABLE		-1		/* Temporary failure. The GUI
+						   should wait briefly */
+#define GFTP_EFATAL		-2		/* Fatal error */
+#define GFTP_ERETRYABLE_NO_WAIT	-3		/* Temporary failure. The GUI
+						   should not wait and should
+						   reconnect */
+#define GFTP_ENOTRANS		-4		/* Custom error. This is
+						   returned when a FXP transfer
+						   is requested */
+#define GFTP_ETIMEDOUT		-5		/* Connected timed out */
+
+/* Some general settings */
+#define BASE_CONF_DIR		"~/.gftp"
+#define CONFIG_FILE		BASE_CONF_DIR "/gftprc"
+#define BOOKMARKS_FILE		BASE_CONF_DIR "/bookmarks"
+#define LOG_FILE		BASE_CONF_DIR "/gftp.log"
+#define MAX_HIST_LEN		10
+#define GFTP_URL_USAGE		"[[protocol://][user[:pass]@]site[:port][/directory]]"
+
+typedef enum gftp_logging_level_tag 
+{
+  gftp_logging_send,
+  gftp_logging_recv,
+  gftp_logging_error,
+  gftp_logging_misc,
+  gftp_logging_misc_nolog 	/* Log to the screen, but don't log to disk */
+} gftp_logging_level;
+
+typedef struct gftp_file_tag gftp_file;
+
+#define GFTP_TRANS_ACTION_OVERWRITE		1
+#define GFTP_TRANS_ACTION_RESUME		2
+#define GFTP_TRANS_ACTION_SKIP			3
+
+#define GFTP_SORT_COL_FILE			1
+#define GFTP_SORT_COL_SIZE			2
+#define GFTP_SORT_COL_USER			3
+#define GFTP_SORT_COL_GROUP			4
+#define GFTP_SORT_COL_DATETIME			5
+#define GFTP_SORT_COL_ATTRIBS			6
+
+#define GFTP_IS_SPECIAL_DEVICE(mode)	(S_ISBLK (mode) || S_ISCHR (mode))
+
+struct gftp_file_tag 
+{
+  /*@null@*/ char *file,	/* Our filename */
+                  *user,	/* User that owns it */
+                  *group,	/* Group that owns it */
+                  *destfile;	/* Full pathname to the destination for the 
+                                   file transfer */
+
+  int fd;			/* Already open fd for this file */
+  /* FIXME - add fd_open function */
+
+  time_t datetime;		/* File date and time */
+  off_t size,			/* Size of the file */
+        startsize;		/* Size to start the transfer at */
+  mode_t st_mode;		/* File attributes */
+
+  dev_t st_dev;			/* The device and associated inode. These */
+  ino_t st_ino;			/* two fields are used for detecting loops */
+				/* with symbolic links. */
+
+  unsigned int selected : 1,	/* Is this file selected? */
+               was_sel : 1,	/* Was this file selected before  */
+               shown : 1,	/* Is this file shown? */
+               done_view : 1,	/* View the file when done transfering? */
+               done_edit : 1,	/* Edit the file when done transfering? */
+               done_rm : 1,	/* Remove the file when done */
+               transfer_done : 1, /* Is current file transfer done? */
+               retry_transfer : 1, /* Is current file transfer done? */
+               exists_other_side : 1, /* The file exists on the other side
+                                         during the file transfer */
+               filename_utf8_encoded : 1; /* Is the filename properly UTF8
+                                             encoded? */
+
+  char transfer_action;		/* See the GFTP_TRANS_ACTION_* vars above */
+  /*@null@*/ void *user_data;
+};
+
+
+typedef struct gftp_proxy_hosts_tag 
+{
+  /* FIXME - add IPV6 stuff here */
+
+  gint32 ipv4_network_address, 
+         ipv4_netmask;
+  char *domain;
+} gftp_proxy_hosts;
+
+
+/* Note, these numbers must match up to the index number in config_file.c
+   in the declaration of gftp_option_types */
+typedef enum 
+{
+  gftp_option_type_text		= 0,
+  gftp_option_type_textcombo	= 1,
+  gftp_option_type_textcomboedt = 2,
+  gftp_option_type_hidetext	= 3,
+  gftp_option_type_int		= 4,
+  gftp_option_type_checkbox	= 5,
+  gftp_option_type_intcombo	= 6,
+  gftp_option_type_float	= 7,
+  gftp_option_type_color	= 8,
+  gftp_option_type_notebook	= 9
+} gftp_option_type_enum;
+
+
+#define GFTP_PORT_GTK			(1 << 1)
+#define GFTP_PORT_TEXT			(1 << 2)
+#define GFTP_PORT_ALL			(GFTP_PORT_GTK | GFTP_PORT_TEXT)
+
+
+typedef struct gftp_config_list_vars_tag
+{
+  char *key;
+  void * (*read_func) (char *buf, int line);
+  void (*write_func) (FILE *fd, void *data);
+  GList * list;
+  unsigned int num_items;
+  char *header;
+} gftp_config_list_vars;
+
+
+#define GFTP_CVARS_FLAGS_DYNMEM			(1 << 1)
+#define GFTP_CVARS_FLAGS_DYNLISTMEM		(1 << 2)
+#define GFTP_CVARS_FLAGS_SHOW_BOOKMARK		(1 << 3)
+
+typedef struct gftp_config_vars_tag
+{
+  /*@null@*/ char *key,		/* variable name */
+                  *description;	/* How this field will show up in the dialog */
+  int otype;			/* Type of option this is */
+  /*@null@*/ void *value;
+  /*@null@*/ void *listdata;	/* For options that have several different 
+				   options, this is a list of all the options.
+				   Each option_type that uses this will use this
+				   field differently */
+  int flags;			/* See GFTP_CVARS_FLAGS_* above */
+  /*@null@*/ char *comment;     /* Comment to write out to the config file */
+  int ports_shown;		/* What ports of gFTP is this option shown in */
+  /*@null@*/ void *user_data;	/* Data that the GUI can store here (Widget in gtk+) */
+} gftp_config_vars;
+
+
+typedef struct gftp_option_type_tag
+{
+  int (*read_function) (char *str, gftp_config_vars * cv, int line);
+  int (*write_function) (gftp_config_vars * cv, /*@out@*/ char *buf,
+                         size_t buflen, int to_config_file);
+  void (*copy_function) (gftp_config_vars * cv, gftp_config_vars * dest_cv);
+  int (*compare_function) (gftp_config_vars * cv1, gftp_config_vars * cv2);
+  void *(*ui_print_function) (gftp_config_vars * cv, void *user_data, void *value);
+  void (*ui_save_function) (gftp_config_vars * cv, void *user_data);
+  void (*ui_cancel_function) (gftp_config_vars * cv, void *user_data);
+  void *user_data;
+} gftp_option_type_var;
+
+
+#define GFTP_TEXTCOMBOEDT_EDITABLE 	(1 << 0)
+
+typedef struct gftp_textcomboedt_data_tag
+{
+  /*@null@*/ char *description,
+                  *text;
+  int flags;
+} gftp_textcomboedt_data;
+
+
+typedef struct gftp_request_tag gftp_request;
+
+typedef void (*gftp_logging_func)		( gftp_logging_level level, 
+						  /*@null@*/ gftp_request * request, 
+						  const char *string, ... );
+
+#define GFTP_ANONYMOUS_USER			"anonymous"
+#define gftp_need_username(request)		((request)->need_username && ((request)->username == NULL || *(request)->username == '\0'))
+#define gftp_need_password(request)		((request)->need_password && (request)->username != NULL && *(request)->username != '\0' && strcasecmp ((request)->username, GFTP_ANONYMOUS_USER) != 0 && ((request)->password == NULL || *(request)->password == '\0'))
+
+struct gftp_request_tag 
+{
+  int protonum;			/* Current number of the protocol this is 
+                                   set to */
+  char *hostname,		/* Hostname we will connect to */
+       *username,		/* Username for host*/
+       *password,		/* Password for host */
+       *account,		/* Account for host (FTP only) */
+       *directory,		/* Current working directory */
+       *url_prefix,		/* URL Prefix (ex: ftp) */
+       *last_ftp_response,	/* Last response from server */
+       *last_dir_entry;		/* Last dir entry from server */
+  size_t last_dir_entry_len;	/* Length of last_dir_entry */
+
+  unsigned int port;		/* Port of remote site */
+
+  int datafd,			/* Data connection */
+      cachefd;			/* For the directory cache */
+  int wakeup_main_thread[2];	/* FD that gets written to by the threads
+                                   to wakeup the parent */
+
+  void *remote_addr;
+  size_t remote_addr_len;
+  int ai_family;
+
+  int server_type;		/* The type of server we are connected to.
+                                   See GFTP_DIRTYPE_* above */
+  unsigned int use_proxy : 1,
+               always_connected : 1,
+               need_hostport : 1,
+               need_username : 1,
+               need_password : 1,
+               use_cache : 1,           /* Enable or disable the cache */
+               cached : 1,              /* Is this directory listing cached? */
+               cancel : 1,		/* If a signal is received, should
+					   we cancel this operation */
+               stopable : 1,
+               refreshing : 1,
+               use_local_encoding : 1;
+
+  off_t gotbytes;
+ 
+  void *protocol_data;
+   
+  gftp_logging_func logging_function;
+  void *user_data;
+
+  int (*init)				( gftp_request * request );
+  void (*copy_param_options) 		( gftp_request * dest_request, 
+					  gftp_request * src_request );
+  ssize_t (*read_function)		( gftp_request * request,
+					  void *ptr, 
+					  size_t size, 
+					  int fd );
+  ssize_t (*write_function)		( gftp_request * request, 
+					  const char *ptr, 
+					  size_t size, 
+					  int fd );
+  void (*destroy)			( gftp_request * request );
+  int (*connect)			( gftp_request * request );
+  int (*post_connect)			( gftp_request * request );
+  void (*disconnect) 			( gftp_request * request );
+  off_t (*get_file) 			( gftp_request * request, 
+					  const char *filename, 
+					  off_t startsize );
+  int (*put_file) 			( gftp_request * request, 
+					  const char *filename, 
+					  off_t startsize,
+					  off_t totalsize );
+  off_t (*transfer_file) 		( gftp_request * fromreq, 
+					  const char *fromfile, 
+					  off_t fromsize, 
+					  gftp_request * toreq, 
+					  const char *tofile, 
+					  off_t tosize );
+  ssize_t (*get_next_file_chunk) 	( gftp_request * request, 
+					  char *buf, 
+					  size_t size );
+  ssize_t (*put_next_file_chunk) 	( gftp_request * request, 
+					  char *buf, 
+					  size_t size );
+  int (*end_transfer) 			( gftp_request * request );
+  int (*abort_transfer) 		( gftp_request * request );
+  int (*stat_filename) 			( gftp_request * request,
+					  const char *filename,
+					  mode_t * mode,
+					  off_t * filesize );
+  int (*list_files) 			( gftp_request * request );
+  int (*get_next_file)			( gftp_request * request, 
+					  gftp_file *fle, 
+					  int fd );
+  ssize_t (*get_next_dirlist_line)	( gftp_request * request, 
+					  int fd,
+					  char *buf,
+					  size_t buflen );
+  off_t (*get_file_size) 		( gftp_request * request, 
+					  const char *filename );
+  int (*chdir)				( gftp_request * request, 
+					  const char *directory );
+  int (*rmdir)				( gftp_request * request, 
+					  const char *directory );
+  int (*rmfile)				( gftp_request * request, 
+					  const char *filename );
+  int (*mkdir)				( gftp_request * request, 
+					  const char *directory );
+  int (*rename)				( gftp_request * request, 
+					  const char *oldname, 
+					  const char *newname );
+  int (*chmod)				( gftp_request * request, 
+					  const char *filename, 
+					  mode_t mode );
+  int (*set_file_time)			( gftp_request * request, 
+					  const char *filename, 
+					  time_t datettime );
+  int (*site)				( gftp_request * request, 
+					  int specify_site,
+					  const char *filename );
+  int (*parse_url)			( gftp_request * request,
+					  const char *url );
+  int (*set_config_options)		( gftp_request * request );
+  void (*swap_socks)			( gftp_request * dest,
+					  gftp_request * source );
+
+  gftp_config_vars * local_options_vars;
+  int num_local_options_vars;
+  GHashTable * local_options_hash;
+#ifdef USE_SSL
+  SSL * ssl;
+#endif
+
+#if GLIB_MAJOR_VERSION > 1
+  GIConv iconv_to, iconv_from; 
+  unsigned int iconv_from_initialized : 1,
+               iconv_to_initialized : 1;
+  char *iconv_charset;
+#endif
+};
+
+
+typedef struct gftp_transfer_tag
+{
+  gftp_request * fromreq,
+               * toreq;
+
+  unsigned int cancel : 1,
+               ready : 1,
+               started : 1,
+               done : 1,
+               show : 1,
+               stalled : 1,
+               conn_error_no_timeout : 1,
+               next_file : 1,
+               skip_file : 1;
+
+  struct timeval starttime,
+                 lasttime;
+
+  double kbs;
+  
+  GList * files,
+        * curfle,
+        * updfle;
+
+  long numfiles,
+       numdirs,
+       current_file_number,
+       current_file_retries;
+
+  off_t curtrans,		/* Current transfered bytes for this file */
+        tot_file_trans,		/* Total number of bytes in the file being
+                                   transferred */
+        curresumed,		/* Resumed bytes for this file */
+        trans_bytes,		/* Amount of data transfered for entire 
+				   transfer */
+        total_bytes, 		/* Grand total bytes for whole transfer */
+        resumed_bytes;		/* Grand total of resumed bytes for whole 
+                                   transfer */
+
+  void * fromwdata,
+       * towdata;
+
+  GStaticMutex statmutex,
+               structmutex;
+
+  void *user_data;
+  void *thread_id;
+  void *clist;
+} gftp_transfer;
+
+
+typedef struct gftp_log_tag
+{
+  char *msg;
+  gftp_logging_level type;
+} gftp_log;
+
+
+typedef struct supported_gftp_protocols_tag 
+{
+  /*@null@*/ char *name;			/* Description of protocol */
+  /*@null@*/ int (*init) (gftp_request * request); /* Init function */
+  /*@null@*/ void (*register_options) (void);	/* Protocol options */
+  /*@null@*/ char *url_prefix;			/* URL Prefix */
+  unsigned int default_port;			/* Default port */
+  unsigned int shown : 1,			/* Whether this protocol is 
+                                                   shown or not to the user in 
+                                                   the protocol dropdown box */
+               use_threads : 1;			/* Whether or not operations in
+						   this protocol should use
+						   threads */
+} supported_gftp_protocols;
+
+
+typedef struct gftp_bookmarks_tag gftp_bookmarks_var;
+
+struct gftp_bookmarks_tag 
+{
+  char *path,                  /* Path */
+       *oldpath,               /* Old path name */
+       *hostname,              /* Our actual internet hostname */
+       *protocol,              /* Protocol we will connect through */
+       *remote_dir,            /* Initial directory */
+       *local_dir,             /* Init local directory */
+       *user,                  /* Username to log in as */
+       *pass,                  /* Our password */
+       *acct;                  /* Account */
+
+  unsigned int port,           /* The port we will connect to */
+               isfolder : 1,   /* If this is set, then the children field can
+                                  be non-NULL */
+               save_password : 1; /* Save this password */
+  gftp_bookmarks_var *children, /* The children of this node. */
+                     *prev, 	/* The parent of this node */
+                     *next; 	/* The next sibling of this node */
+  gpointer cnode; 
+
+  gftp_config_vars * local_options_vars;
+  int num_local_options_vars;
+  GHashTable * local_options_hash;
+};
+
+
+typedef struct gftp_file_extensions_tag
+{
+   char *ext,                   /* The file extension to register */
+        *filename,              /* The xpm file to display */
+        *view_program,          /* The program used to view this file */
+        *ascii_binary;          /* Is this a ASCII transfer or a BINARY transfer */
+   unsigned int stlen;          /* How long is the file extension. */
+} gftp_file_extensions;
+
+
+typedef struct gftp_color_tag
+{
+  gushort red,
+          green,
+          blue;
+} gftp_color;
+
+
+typedef struct gftp_getline_buffer_tag
+{
+  char *buffer,
+       *curpos;
+  size_t max_bufsize,
+         cur_bufsize;
+  unsigned int eof : 1;
+} gftp_getline_buffer;
+
+
+/* Global config options. These are defined in options.h */
+/*@null@*/ extern GList * gftp_file_transfers, * gftp_file_transfer_logs,
+                        * gftp_options_list;
+/*@null@*/ extern GHashTable * gftp_global_options_htable, * gftp_bookmarks_htable, 
+                             * gftp_config_list_htable;
+/*@null@*/ extern gftp_bookmarks_var * gftp_bookmarks;
+/*@null@*/ extern FILE * gftp_logfd;
+extern gftp_config_vars gftp_global_config_vars[];
+extern supported_gftp_protocols gftp_protocols[];
+extern char gftp_version[];
+extern int gftp_configuration_changed;
+
+/* This is defined in config_file.c */
+
+extern gftp_option_type_var gftp_option_types[];
+
+/* cache.c */
+void gftp_generate_cache_description 	( gftp_request * request, 
+					  /*@out@*/ char *description,
+					  size_t len, 
+					  int ignore_directory );
+
+int gftp_new_cache_entry 		( gftp_request * request );
+
+int gftp_find_cache_entry 		( gftp_request * request );
+
+void gftp_clear_cache_files 		( void );
+
+void gftp_delete_cache_entry 		( gftp_request * request,
+					  char *descr,
+					  int ignore_directory );
+
+/* charset-conv.c */
+/*@null@*/ char * gftp_string_to_utf8	( gftp_request * request, 
+					  const char *str,
+					  size_t *dest_len );
+
+/*@null@*/ char * gftp_string_from_utf8	( gftp_request * request, 
+					  int force_local,
+					  const char *str,
+					  size_t *dest_len );
+
+/*@null@*/ char * gftp_filename_to_utf8	( gftp_request * request, 
+					  const char *str,
+					  size_t *dest_len );
+
+/*@null@*/ char * gftp_filename_from_utf8 ( gftp_request * request, 
+					  const char *str,
+					  size_t *dest_len );
+
+/* config_file.c */
+int gftp_config_parse_args 		( char *str, 
+					  int numargs, 
+					  int lineno, 
+					  /*@out@*/ char **first, 
+					  ... );
+
+void gftp_add_bookmark 			( gftp_bookmarks_var * newentry );
+
+void gftp_read_config_file 		( char *global_data_path );
+
+void gftp_write_bookmarks_file 		( void );
+
+void gftp_write_config_file 		( void );
+
+GHashTable * build_bookmarks_hash_table	( gftp_bookmarks_var * entry );
+
+void print_bookmarks 			( gftp_bookmarks_var * bookmarks );
+
+void gftp_lookup_global_option 		( const char * key, 
+					  /*@out@*/ void *value );
+
+void gftp_lookup_request_option 	( gftp_request * request, 
+					  const char * key, 
+					  /*@out@*/ void *value );
+
+
+void gftp_lookup_bookmark_option 	( gftp_bookmarks_var * bm, 
+					  const char * key, 
+					  void *value );
+
+void gftp_set_global_option 		( const char * key, 
+					  const void *value );
+
+void gftp_set_request_option 		( gftp_request * request, 
+					  const char * key, 
+					  const void *value );
+
+void gftp_set_bookmark_option 		( gftp_bookmarks_var * bm,
+					  const char * key, 
+					  const void *value );
+
+void gftp_register_config_vars 		( gftp_config_vars *config_vars );
+
+void gftp_copy_local_options 		( gftp_config_vars ** new_options_vars, 
+					  GHashTable ** new_options_hash,
+					  int *new_num_local_options_vars,
+					  gftp_config_vars * orig_options,
+					  int num_local_options_vars );
+
+void gftp_config_free_options 		( gftp_config_vars * options_vars,
+					  GHashTable * options_hash,
+					  int num_options_vars );
+
+void gftp_bookmarks_destroy 		( gftp_bookmarks_var * bookmarks );
+
+void gftp_free_proxy_hosts 		( GList * proxy_hosts );
+
+GList * gftp_copy_proxy_hosts 		( GList * proxy_hosts );
+
+/* misc.c */
+/*@null@*/ char *insert_commas 		( off_t number, 
+					  char *dest_str, 
+					  size_t dest_len );
+
+char *alltrim 				( char *str );
+
+char *gftp_expand_path 			( gftp_request * request,
+					  const char *src );
+
+void make_nonnull 			( char **str );
+
+int gftp_match_filespec 		( gftp_request * request,
+					  const char *filename, 
+					  const char *filespec );
+
+int gftp_parse_command_line 		( int *argc,
+					  char ***argv );
+
+void gftp_usage 			( void );
+
+gint string_hash_compare 		( gconstpointer path1,
+					  gconstpointer path2 );
+
+guint string_hash_function		( gconstpointer key );
+
+gint uint_hash_compare 			( gconstpointer path1,
+					  gconstpointer path2 );
+
+guint uint_hash_function		( gconstpointer key );
+
+void free_file_list			( GList * filelist );
+
+gftp_file * copy_fdata 			( gftp_file * fle );
+
+int compare_request 			( gftp_request * request1, 
+					  gftp_request * request2, 
+					  int compare_dirs );
+
+gftp_transfer * gftp_tdata_new 		( void );
+
+void free_tdata 			( gftp_transfer * tdata );
+
+gftp_request * gftp_copy_request 	( gftp_request * req );
+
+GList * gftp_sort_filelist 		( GList * filelist, 
+					  int column, 
+					  int asds );
+
+char * gftp_gen_ls_string 		( gftp_request * request,
+					  gftp_file * fle, 
+					  char *file_prefixstr, 
+					  char *file_suffixstr );
+
+char * base64_encode 			( char *str );
+
+void gftp_free_bookmark 		( gftp_bookmarks_var * entry,
+					  int free_node );
+
+void gftp_shutdown			( void );
+
+GList * get_next_selection 		( GList * selection, 
+					  GList ** list, 
+					  int *curnum );
+
+char * gftp_build_path 			( gftp_request * request,
+					  const char *first_element,
+					  ... );
+
+void gftp_locale_init 			( void );
+
+char * gftp_scramble_password		( const char *password );
+
+char * gftp_descramble_password		( const char *password );
+
+int gftp_get_transfer_action 		( gftp_request * request,
+					  gftp_file * fle );
+
+char * gftp_get_share_dir 		( void );
+
+/* mkstemps.c */
+int mkstemps 				( char *template,
+					  int suffix_len );
+
+/* parse-dir-listing.c */
+time_t parse_time 			( char *str,
+					  char **endpos );
+
+int gftp_parse_ls 			( gftp_request * request,
+					  const char *lsoutput, 
+					  gftp_file *fle,
+					  int fd );
+
+/* protocols.c */
+#define GFTP_FTP_NUM				0
+#define GFTP_FTPS_NUM				1
+#define GFTP_HTTP_NUM				2
+#define GFTP_HTTPS_NUM				3
+#define GFTP_LOCAL_NUM				4
+#define GFTP_SSHV2_NUM				5
+#define GFTP_BOOKMARK_NUM			6
+#define GFTP_FSP_NUM				7
+
+#define GFTP_IS_CONNECTED(request)		((request) != NULL && \
+                                                 ((request)->datafd > 0 || \
+                                                  (request)->cached || \
+                                                  (request)->always_connected))
+
+
+int rfc959_init 			( gftp_request * request );
+
+void rfc959_register_module		( void );
+
+int rfc959_get_next_file 		( gftp_request * request, 
+					  gftp_file *fle, 
+					  int fd );
+
+int rfc959_connect 			( gftp_request * request );
+
+int ftps_init 				( gftp_request * request );
+
+void ftps_register_module		( void );
+
+int rfc2068_init 			( gftp_request * request );
+
+void rfc2068_register_module		( void );
+
+int https_init 				( gftp_request * request );
+
+void https_register_module		( void );
+
+int local_init 				( gftp_request * request );
+
+void local_register_module		( void );
+
+int sshv2_init 				( gftp_request * request );
+
+void sshv2_register_module		( void );
+
+void ssl_register_module		( void );
+
+int bookmark_init 			( gftp_request * request );
+
+void bookmark_register_module		( void );
+
+int fsp_init				( gftp_request * request );
+
+void fsp_register_module		( void );
+
+gftp_request *gftp_request_new 		( void );
+
+void gftp_request_destroy 		( gftp_request * request,
+					  int free_request );
+
+void gftp_copy_param_options		( gftp_request * dest_request,
+					  gftp_request * src_request );
+
+void gftp_file_destroy 			( gftp_file *file,
+					  int free_it );
+
+int gftp_connect 			( gftp_request * request );
+
+void gftp_disconnect 			( gftp_request * request );
+
+off_t gftp_get_file 			( gftp_request * request, 
+					  const char *filename, 
+					  off_t startsize );
+
+int gftp_put_file 			( gftp_request * request, 
+					  const char *filename, 
+					  off_t startsize,
+					  off_t totalsize );
+
+off_t gftp_transfer_file 		( gftp_request *fromreq, 
+					  const char *fromfile, 
+					  off_t fromsize, 
+					  gftp_request *toreq, 
+					  const char *tofile, 
+					  off_t tosize );
+
+ssize_t gftp_get_next_file_chunk 	( gftp_request * request, 
+					  char *buf, 
+					  size_t size );
+
+ssize_t gftp_put_next_file_chunk 	( gftp_request * request, 
+					  char *buf, 
+					  size_t size );
+
+int gftp_list_files 			( gftp_request * request );
+
+int gftp_parse_bookmark 		( gftp_request * request, 
+					  gftp_request * local_request,
+					  const char * bookmark,
+					  int *refresh_local );
+
+int gftp_parse_url 			( gftp_request * request, 
+					  const char *url );
+
+int gftp_get_next_file 			( gftp_request * request, 
+					  const char *filespec,
+					  gftp_file *fle );
+
+int gftp_end_transfer 			( gftp_request * request );
+
+int gftp_abort_transfer 		( gftp_request * request );
+
+int gftp_stat_filename			( gftp_request * request,
+					  const char *filename,
+					  mode_t * mode,
+					  off_t * filesize );
+
+void gftp_set_hostname 			( gftp_request * request, 
+					  const char *hostname );
+
+void gftp_set_username 			( gftp_request * request, 
+					  const char *username );
+
+void gftp_set_password 			( gftp_request * request, 
+					  const char *password );
+
+void gftp_set_account 			( gftp_request * request, 
+					  const char *account );
+
+int gftp_set_directory 			( gftp_request * request, 
+					  const char *directory );
+
+void gftp_set_port 			( gftp_request * request, 
+					  unsigned int port );
+
+int gftp_remove_directory 		( gftp_request * request, 
+					  const char *directory );
+
+int gftp_remove_file 			( gftp_request * request, 
+					  const char *file );
+
+int gftp_make_directory 		( gftp_request * request, 
+					  const char *directory );
+
+int gftp_rename_file 			( gftp_request * request, 
+					  const char *oldname, 
+					  const char *newname );
+
+int gftp_chmod 				( gftp_request * request, 
+					  const char *file, 
+					  mode_t mode );
+
+int gftp_set_file_time 			( gftp_request * request, 
+					  const char *file, 
+					  time_t datetime );
+
+int gftp_site_cmd 			( gftp_request * request, 
+					  int specify_site,
+					  const char *command );
+
+off_t gftp_get_file_size 		( gftp_request * request, 
+					  const char *filename );
+
+void gftp_calc_kbs 			( gftp_transfer * tdata, 
+				 	  ssize_t num_read );
+
+int gftp_get_all_subdirs 		( gftp_transfer * transfer, 
+					  void (*update_func) 
+						( gftp_transfer * transfer ));
+
+int gftp_set_config_options 		( gftp_request * request );
+
+void print_file_list 			( GList * list );
+
+void gftp_swap_socks 			( gftp_request * dest, 
+					  gftp_request * source );
+
+void gftp_calc_kbs 			( gftp_transfer * tdata, 
+					  ssize_t num_read );
+
+int gftp_get_transfer_status 		( gftp_transfer * tdata, 
+					  ssize_t num_read );
+
+int gftp_fd_open 			( gftp_request * request, 
+					  const char *pathname, 
+					  int flags,
+					  mode_t perms );
+
+void gftp_setup_startup_directory 	( gftp_request * request,
+					  const char *option_name );
+
+unsigned int gftp_protocol_default_port	( gftp_request * request );
+
+/* pty.c */
+char * gftp_get_pty_impl 		( void );
+
+pid_t gftp_exec 			( gftp_request * request,
+					  int *fdm,
+					  int *ptymfd,
+					  char **args );
+
+char *gftp_convert_attributes_from_mode_t ( mode_t mode );
+
+mode_t gftp_convert_attributes_to_mode_t ( char *attribs );
+
+
+#ifdef USE_SSL
+/* sslcommon.c */
+int gftp_ssl_startup 			( gftp_request * request );
+
+int gftp_ssl_session_setup 		( gftp_request * request );
+
+void gftp_ssl_free 			( gftp_request * request );
+
+ssize_t gftp_ssl_read 			( gftp_request * request, 
+					  void *ptr, 
+					  size_t size, 
+					  int fd );
+
+ssize_t gftp_ssl_write 			( gftp_request * request, 
+					  const char *ptr, 
+					  size_t size, 
+					  int fd );
+#endif /* USE_SSL */
+
+/* UI dependent functions that must be implemented */
+int gftpui_protocol_ask_yes_no 		( gftp_request * request,
+					  char *title,
+					  char *question );
+
+char *gftpui_protocol_ask_user_input	( gftp_request * request,
+					  char *title,
+					  char *question,
+					  int shown );
+
+void gftpui_protocol_update_timeout 	( gftp_request * request );
+
+#endif
+
+/* socket-connect.c */
+int gftp_connect_server 		( gftp_request * request, 
+					  char *service,
+					  char *proxy_hostname,
+					  unsigned int proxy_port );
+
+/* socket-connect-getaddrinfo.c */
+struct addrinfo * lookup_host_with_getaddrinfo
+					( gftp_request *request,
+					  char *service,
+					  char *proxy_hostname,
+					  int proxy_port );
+
+int gftp_connect_server_with_getaddrinfo
+					( gftp_request * request,
+					  char *service,
+					  char *proxy_hostname,
+					  unsigned int proxy_port );
+
+/* socket-connect-gethostbyname.c */
+int lookup_host_with_gethostbyname	( gftp_request *request,
+					  char *proxy_hostname,
+					  struct hostent *hostp );
+
+int gftp_connect_server_legacy		( gftp_request * request,
+					  char *service,
+					  char *proxy_hostname,
+					  unsigned int proxy_port );
+
+/* sockutils.c */
+ssize_t gftp_get_line 			( gftp_request * request, 
+					  /*@out@*/ gftp_getline_buffer ** rbuf,
+					  /*@out@*/ char * str, 
+					  size_t len, 
+					  int fd );
+
+void gftp_free_getline_buffer 		( gftp_getline_buffer ** rbuf );
+
+ssize_t gftp_fd_read 			( gftp_request * request, 
+					  void *ptr, 
+					  size_t size, 
+					  int fd );
+
+ssize_t gftp_fd_write 			( gftp_request * request, 
+					  const char *ptr, 
+					  size_t size, 
+					  int fd );
+
+ssize_t gftp_writefmt 			( gftp_request * request, 
+					  int fd, 
+					  const char *fmt, 
+					  ... );
+
+int gftp_fd_set_sockblocking 		( gftp_request * request, 
+					  int fd, 
+					  int non_blocking );
+
+struct servent * r_getservbyname	( const char *name,
+					  const char *proto,
+					  struct servent *result_buf,
+					  int *h_errnop );
+
